check if column[i].button is valid before calling gtk_widget_intersect on

* gtk/gtkclist.c: check if column[i].button is valid before calling
gtk_widget_intersect on it in gtk_clist_draw

* gtk/gtkdnd.c: removed unused variable empty_bits

* gtk/gtkrc.c: we should use gslist_* functions with GSLists...

* gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
a boolean (thanks to Elrond for noticing this)

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 52bae6155c2bba77f808ff18ddcf56a9519e3908..c38c104225f5abf4b1303784038e52fda55d3a90 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Sat Nov  7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkclist.c: check if column[i].button is valid before calling
+       gtk_widget_intersect on it in gtk_clist_draw
+
+       * gtk/gtkdnd.c: removed unused variable empty_bits
+
+       * gtk/gtkrc.c: we should use gslist_* functions with GSLists...
+
+       * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
+       a boolean (thanks to Elrond for noticing this)
+
 1998-11-07  Jay Cox  <jaycox@earthlink.net>
 
        * gtk/gtkwindow.c: forward declaration for gtk_window_paint

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index f68e7ac93a0839e6ba98de4a02cc9ed100b9d0ce..de78722f5b147c8f3ad309cfa0672069093b5f39 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4429,7 +4429,8 @@ gtk_clist_draw (GtkWidget    *widget,
        {
          if (!clist->column[i].visible)
            continue;
-         if (gtk_widget_intersect(clist->column[i].button, area, &child_area))
+         if (clist->column[i].button &&
+             gtk_widget_intersect(clist->column[i].button, area, &child_area))
            gtk_widget_draw (clist->column[i].button, &child_area);
        }
     }

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 151a5c0eb8aba083eef35f1f06ce82ff21ccc9bf..04909165af638815109c005a370d4cbb46cb8b32 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -282,11 +282,6 @@ static char action_none_mask_bits[] = {
   0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 
   0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07, 0x00, };
 
-static char empty_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-
 #define CURSOR_WIDTH 16
 #define CURSOR_HEIGHT 16
 

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 0f3767a03a238043a63153cfbba9b2387efcc7b8..fb006fb2421b10abfce28aa8be1571f4af6019e0 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -612,7 +612,7 @@ gtk_rc_get_style (GtkWidget *widget)
                                               rc_style_key_id);
 
   if (widget_rc_style)
-    rc_styles = g_list_prepend (rc_styles, widget_rc_style);
+    rc_styles = g_slist_prepend (rc_styles, widget_rc_style);
   
   if (gtk_rc_sets_widget)
     {

diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index 2f9261d8a53ed7867553a91c210b2fa52918a2cc..49074bc8ea1a635b924697f55ab4ea0062bc29e9 100644 (file)
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -463,7 +463,7 @@ gtk_type_describe_tree (GtkType      type,
     }
 }
 
-gint
+gboolean
 gtk_type_is_a (GtkType type,
               GtkType is_a_type)
 {

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 0eecc000d07c69515fc9c23b55a8854754897348..51dc06624cb9b31544fdb176a7e3ff921805e1fa 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -325,7 +325,7 @@ void                gtk_type_free                   (GtkType         type,
 void           gtk_type_describe_heritage      (GtkType         type);
 void           gtk_type_describe_tree          (GtkType         type,
                                                 gboolean        show_size);
-gint           gtk_type_is_a                   (GtkType         type,
+gboolean       gtk_type_is_a                   (GtkType         type,
                                                 GtkType         is_a_type);
 GtkTypeObject* gtk_type_check_object_cast      (GtkTypeObject  *type_object,
                                                 GtkType         cast_type);

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index cbecece6863cc4f755bc8ec00088d0ff80464efe..4c571f93b7db6d6b957caaed4ef052aaedb1cbce 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -1843,7 +1843,6 @@ create_pixmap (void)
   GtkWidget *pixmapwid;
   GdkPixmap *pixmap;
   GdkBitmap *mask;
-  GtkStyle *style;
 
   if (!window)
     {

diff --git a/tests/testgtk.c b/tests/testgtk.c
index cbecece6863cc4f755bc8ec00088d0ff80464efe..4c571f93b7db6d6b957caaed4ef052aaedb1cbce 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1843,7 +1843,6 @@ create_pixmap (void)
   GtkWidget *pixmapwid;
   GdkPixmap *pixmap;
   GdkBitmap *mask;
-  GtkStyle *style;
 
   if (!window)
     {